how to resolve merge conflict